Readme update; cleanups