I think I've fixed issue #1 and also modified the .sql file thats needed for this package