cleanups
changed some vars to bool