tweaks, added bits of etch.js