Fixed versions of certain packages and tidied up package loading