updates and tweaks