post-hackathon fixes