Update #12 - Small QoL Changes