more tweaks based on checken work