More edits from hackathon

Misc. additions and changes.