resolving few minor bugs