Add full boolean expression support, other misc. things