Add some more basic status info, fix bugs