ChopJS: Update

Squashed multiple commits together and re-submit again..

Sorry about the early mess...