a few smaller fixes.