some cleanups
Updated some files