Fix usage and add init-to-shell option