Updates to the wizard

Added some new feature to make consuming existing single file apps
easier.