Fixed opt parsing issue by quoting $@ and added manual entry opt