Did a little cleanup and fixed dependancies