Fixed 1.2.0 commands + minor changes