* some fixes.