Adding some options and whatnot.
Remove debug exit call.