change numbers to use boolean
fixed spelling error
merge, conflicts fixed