Add some more comments and clean up existing ones