Improvements

Hey,

Thanks for working on this. It looks great!

I've fixed a few things and made it production ready.

I will graft it onto the existing demo in the next weeks.

Cheers!