bunch of changes for final commit before masters