Fixed single-line comments bug.
Added comment block support.
Cleaned up a bit (renaming vars, removing unnecessary ones, etc.).