Finishing touches to v1