Dev dup fixes

last bit of work before i want to push an update out more broadly. 

sorry for the hodge podge nature.