added some finishing touches