Fixed monkey patch, corrected a few other dumb errors.