Renamed and/or/not, added convenience functions