various changes including SQL scripts