Code

More fixes