Fixed some style and vlan handling

Also updated rtalloc1 -> rtalloc