Fixes

Fixes #66 
Fixes #65 
You do? Damn it, emacs failed me.