Made code less gross, adjusted probabilites