Correct style and doc issues, tidy failure message when not SIP