Dev/davide barbieri/working on bugs