created dev branch and some other minor changes