minor changes, moving to master