Replaced drop script with setup that drops database and calls all relevant sql files
Fixed merge and minor spelling mistakes
Fixed merge
Updated field length to accomodate longer fields