temp checkin
misc edits to generate vim annotations