small updates throughout