Fixed some stuff
Improving
Passing the tests again