cleanup the typus stuff and add back custom methods