First edition of the tweaked API; Updated the unit tests; PEP8 fixes;