use proper booleans
use booleans on all handlers