Fixed miscellaneous minor errors