Added in diagnostics, upgraded packages