Final touches to first version