some finishing touches based on feedback, merge time