more spelling and clean up