More updates.
Cleaned up submodules.