fix a bunch of bugs
Merge branch 'master' of github.com:ianderse/clone_wars