Minor Error messages and Model fixes