Use simplified imports
Bump version
Tidy messages