Added Franks fixes & some validation fixes