Bugfixes, improvements and a new program