Updates and tweakings