Things fixed and added and removed!