fixed improper-list handling. needs work on line comments now.