added minor modifications to charge assignement and final report method