fixed couple minor bugs