Update dependencies
Tidy things up a bit
Change manget name