Some tune and cleanup;