damn
Merge remote-tracking branch 'origin/master'
fix some smaller issues