minor bugs in new stuff