tagging
vk fixes; waypoints fixes