Changes to dev environment and fixes a few bugs