minor fixes
cut out moved code