Fixed a bunch of stuff, refactored run into start & run mainly