Position updates and bug fix