added 'remove comment' function and other minimal bugs