fixed more minor bugs