minor corrections and naming changes to prediction system