Updated the make_all sql statements
Fixed drop_all queries and tidied up mistakes