Fixed most of the remaining issues with validation