update dist.ini and support files
tidy code