Fixed set_position
Minor changes