added QoL stuff and fixed some brokenness