Add: more thank yous
Add: some fixes and additions