some more fixes in code.