Various bug fixes:
parameter names (servername instead of servname, etc')
tabbing
missing parenthesis.