Update usage message
Fix #33 and #34
Fix #32