Various

blarg final commit