fixed local usage too
upgrade and normalization to the commandline usage