comment/function name fixes