Alpha 4 - Fix some boo boos