Minor modifications, updated apiary.