Added comments and fixed saving to include positions