Finished going over Ron's comments, though some are still implemented as ToDo's.