More changes and refactoring
More minor updates and corrections
Clean up info
Minify the D3