spiffing up cms some more