Cleaned up predictor, fixed signatures of stubs