Added localcomment types
Fixed a bug