More updates, cleanup and making it better