Added spread probability, cleaned up some funcitons