resolving minor bugs