Added more validation to models, got rid of some rockets.