committing a few changes before merging dev branch