Some code tweaks, rewritten README instructions