Correct the max input validator(?)
Fix Max Input validation and some error handling