Various updates and tweaks