v2 with init fixes and code cleanup