Command line and exceptions added.