ServerInstance arguments added. Misc. Fixes/Comments