added some more mappings and cleaned up some existing ones (removal of superfluous platform variable).