fixing up __init__ imports and execute_query error reporting