Organizational Changes, More Comments, and a Bugfix