corrected a whole mess of things