various tweaks, added name field error checking