Crowdtap-flavored tweaks

LGTMs:
- Carlos
- Maulin
- Tom
- Kyle

Closes #1