Fixes for getting this working as a fiddle