Updated status output and bug fixes