Just a few hacks, integrating ideas from VivaJS