Corrected various erros in model and reporting