Better insertion of comments
more comments fix'in