added to do's & slight style adjusts