Added more functions, played around with the image clicking, survey components, etc