numerous small updates