Document more things. Also do cleanup.