Texture fix

Collision testing
Javadoc and cleanup