More updates

More updates and tweaks