changed the title
Fixed some bugs in develop branch