Finished stitching endgame together and removed a couple of bugs