resolved minor bugs