Updated dependancies to their latest versions, and other minor changes