fixes and features
Merge remote-tracking branch 'origin/Shrdder'