Extensive re-writing and adding EFF customisations
small changes