minor bugfixes, updated sample tools.json.in, formatting fixes, updated README