clean up
add booleans