removed minor bugs