minor changes and outputs a little more verbose