More updates and tweaks.