Formatting and auto-attack fixes