Final touch-ups for v1