removed extra move() (crashed js) and refactored models regarding "self"