Final cleanups. Updated readme. Only testing left...