Added many comments, and updated to 2.10/2.11