a few other minor bugs