fix validation issues, aaaaaand part 3