More updates and cleanup