some more spiffing up