finishing touches and working out issues