Remove awkward macro, tweak exitstatus
Tweak README
Rewriting README, minor refactoring