Ready for Graphics

Misc. Bug fixes