Various fixes - now works out of the box

Let me know what next steps are - want to push this live live live !