Fixed comments. All that is left to do is to fix the last tow bugs that only show up sometimes.