Fixes some issues. Adds not-op support