Few bug fixes, v1 shipped