fixed on click canvas issues and other minor issues