updated from the terminal after problems with merging
Fixing some stuff, adding from the terminal