Parser enhancements and fixes, minor skills fixes
Merge remote-tracking branch 'origin/master'