* some code fixes