Feat/fixes

Closes #115 and #118