some finishing touches and tinkering