tied up loose ends with some validation. Not all validation is done...but the blatant stuff is checked