Solved - 80/100
Some Fixes