Topic/misc bugs

Addresses #67.