Fixed: few small QOL things