Misc. formatting changes
Moved base image from parameter list to just part of script to shorten parameter list and to align with other scripts.  Misc. fixes and formatting.