Clean up, starting to flesh out the documention.