Fix dependency errors, add needed repos.
Some cleanup and check tweaks.
Fix numerous import changes, remove unused.