few small updates/fixes