Code

fix some issues with the