Added CLI options and fixed bin scripts