Updated minor bugs
Updated minor bugs