bugfix, maker comment cleanup