Minor bug fixes; also partial support for phrases (can add, not delete)