Experimental

A few bug fixes and feature updates. Places running v2.2 (starting versioning now).