clean up and added left clicks