tweaks after CL and AK took a brief look