Bugfixes and improved status