Fixes

Fixes #66 
Fixes #65 
Got 'im. Should be good now, I hope.