* bunch of fixes.