Bug fixes and QoL changes