Fixed bugs, improved status detection and reporting