Major feature update. Cleaned up the database some more...