Add Bool Exp and fix further bugs.