Bugfixes & optimization
Readme update