Fix usage instructions
more fixes