More improvements, I think