fixed save cmd + small formatting changes