bunch of small updates