small updates and changes