Some fixed warnings, adding some clarifying comments, and finished some
todos.