added new structure and mysql2 among many fixes