Wrapping up changes to clickable map and compute peak