Fixes and additions

Closes #21, #22, #23