v3: bug fixes and feature updates complete