flipping back to dev branch and fixing a couple of small things