Clean up of some functions, position holding when updating.