Add some missing pieces. Still need to add doucmentation for rest
of vlan arguments.