keep alives, cleaned up, and javadoc