Various Chirp bugs squashed

Fixes #374.