Vrf support, misc bugfixes + improvements