small updates and fixes