#93 a couple more tweaks