fixed many style issues and DB v12