More test, fixes, code cleanup and better readme