Fixed bug collisions and started to move stars

Signed-off-by: Schobben Thomas <schobben.thomas@gmail.com>