Fixes, remove hub
Update a few things