great job! :salute:

also, you can update your nwclay to latest version. ive added some small fixes.