More manual updates and additions bringing it current with modern