Fix first time click and warnings. Also removed debug messages