more workding tweaks