shorten subset syntax
fix issues, spacing, remove last OYO
Merge remote-tracking branch 'upstream/master'