a lot of feedback fixes, updated data