Improvement, bugfixes and a new feature
bug hunting