Debugged (stepped through) &...

minor changes :)