Mended a few things
Merge conflicts, don't you love 'em?
Mended a line to conform with better function input format... (correct jargon?)