Merge fixes and more validation
Finish validation
Added FAQ section/management
Merging Master into Text Changes