Moved the calculation model and fixed some minor output issues...