added all remaining changes.