added some mapper, other improvments