small updates and tweaks