Update base version, minor improvements