better comment parsing, last commit before massive changes