more cleanups and README updated