Fix Validation and Other Minor Bug Fixes