Updated SQL tables
Cleaned up.