More improvements to info