- more dependencies, cleanups