Changed some little stuff
Merge branch 'ben'
minor changes