many small updates and fixes.