General fixes, db dump script restructing.