Cleanups, test, README