Minor changes (comments and name changes) more to follow