cleaning and bug fixes
SQL dump modified