updated

more code fixes