more code fixes...