Bugfixes, tuning and readme updated