updates and tweaks!