Fixing some comments, cleaning up some code. More to do later. Kids + Wife = No Time for Coding