Various fixes

Fixes for #3 #4 and #5