* various bug fixes.