more LAPIcide and rework the clicking stuff