Some minor updates and tweaks