Updates to change the flag to a boolean
Fix some 80 character stuff