use the bool type
fix spelling error
merge. conflicts fixed