lots of updates - finishing touches