made minor cleanups and corrections with Heros I Think at least