Add new state components and the usual cleanup of CRLF crud