Few tweaks, ready for v1!