Added a few new variables. Changed internal behaviour for values after certain cuts to maps for easier handling of new variables and cut combinations.