fixed a ton of things
Merge branch 'master' of http://github.com/purduerov/X6