types are A thing
cleanups and fixups