Validation, Style Fixes, etc..