cleaned up start class, lots of other things...