Updates and tweaks