Rework some items for functionality sake.