Tweaks and README fixes