Add usage messages and fix reference args