minor tweaks to formatting, some error raising on client initialization