More code cleanups.

Additional changes to the data array.
Cleaned up more code & SQL dump.

Cleaned up some code functions and added in the SQL dump.