x
main cleanup
added draws