Cli fix for measures and docs update