made things slightly more configurable
now better for using from the interactive shell