small changes for meeting with Danny. Removed excess, changed a few String to string