Code

some more fixes