a few small changes
Merge branch 'develop-press2' into develop