further code fixes