Fixed some bugs, and updated the status output