Fixes and tweaks
Revert a bad change and update README accordingly