some refactoring, updated README, switched out inifile