Validate all models.. fix some bugs