cleaned up hubbaadapter a bit