Cosmetic changes (a lot!) + external tools for sfs added