Some more fixes

{PEP 8, README} fixes, also some improvements by @spoljo.