Fixed some javadocs and marginally improved the activity (throwaway anyawys)