more cleaning up
track methods tests
minor improvements