Various fixes
Cleanup
Adding some rules to the localstore, though unused