pulling as much as possible over from the 0.3.0 release