added some final touches