Added a few exceptions, conflict logic for modifiers, and more error-checking logic around the same