General improvements in SQL and script

Better ROLE names, a SCHEMA