Fix commands and formatting slightly