Improvement for robots 2D model

+ some bugfixes