Various fixes; starting to implement comment handling