moved usage check - was borken
typo fixes (renames) and comment out missing components