Respond to some review; improve errors and indentation.