Fixed some issues
Completed comment suppor