fixes and new status indicater