more minor bugs and stuff