some minor changes

Here it comes dudes
Merge branch 'master' into Robbin