Fixed, as well as some other comments