some finishing touches I hope...