fixing bad refactor
cleanup
cleanup
cleanup + draw vertices