improvements yay!