ongoing mods
bug fixes for untypeast -> retype