Changed dependancies and commented a few lines