Re-worked database, here's the creation script from MySQL Workbench