Minor updates to comments, upgrade bugfix