Fixes, cleanup, and recursive dependancies.