TestBuild2Final?

Fixed a bunch of bugs.. Seriosly it was silly... Still may be more
lurking around.. But man.