#8 fix map problem
#8 set correct position
#8 code review