Versions + minor fixes