Tweaks and performance fixes
Updating readme