fixed one error, found another
attempting to merge