Fix comments and my poor code-reading skills. Damn you StalkR :-)