fixed bugs in develop