Lots of comments and one bug fix