repeared last problems with mappings

and renamed so names make sense
now all mappings work as they were first set