comment doc cleanup
better property naming
cleanups