Code

Some fixes