various fixes.
update