minor bugs removed