add test coverage and speed up graphics
cleanup