Tweaks

Changes as specified by Melissa Dec 20th, plus elocation-id was not printing as an int.