Fixes

Fixes #66 
Fixes #65 
this looks suspect, why do you need a non breaking space here?