Some stylistic changes.
Fix export searching.
Fixing some errors.