Added a citation, moved some things around and general cleanup.