CSI 2 changes

Added more objects, added click handling