A couple more updates and tweaks.