Add $or functionality and fix typos