fixed bugs in dev