fixed #17 + some on mapping processor