Updated to reflect changes in output names.
Added some output messages for the users. Small bugfixes.