more code fixes.