fixed all the things jon made a mess of