Changes to prediction + minor corrections