Added status.json dumping & made some cleanup