Minor updates
Final updates.