Added local fix and revert modes - Fixes #18