changed some dependencies; whitespace changes