more screen and sql query additions.