Topics/update to 2.2

Update components and upped requirement to 5.4 — test suite fataled otherwise.