Bug fix, rename status file, cleanups
2 files changed