further updates to comments, removed some clutter