more tweaks to get closer to ES6 spec