fix typo; also slow
cleanups