testing dev branch and minor fixes