Release Candidate 2

Just tightening things up and killing fixable errors