Fixed bugs in the SQL.

Still a full package.

More...