Fixes

@jone 

closes #22