General commit, cleaned up some mess.