Updates and tweaks - amazing as usual