finish up validation and other fixes