fix mappers and stuff