setup/update fixes/improvements