Hooking up tabs, small fixes