minor cleanup to replacement values, made calculations more aggressive after last night's clown draft