Version, minor usability improvements