Redesigned the database! Other minor changes