tweaks
fix and tweaks