Adding other changes, ready to create the dev branch