Fixed problem where options weren't respected, added CLI