Cleaning
Corrected value calculations according to changed model
Modified input parameter error handling and changed to use only the 9 assessable categories as input