Further updates and tweaks