More updates and neatening