Removed a good deal of crappy code and fixed up status file