fixed even more minor bugs