merging a few changes from this branch to another