Fix bunch of bugs; Replace the '-k' option with '-e' (default no verification)