Closes #25
Closes #26

Should fix the validation issues.