Reworked some items