Some comments and stuff
Correct calculation of position