Better trail drawing and cleanup
Removed some debugging stuff