Adding solutions from Emanuella Molova

- Fixing some bugs too