Lots of tweaking on diagnose, basic bug fixes
Better README and small PEP8 fixes