more minor bugs