Added logging and in process of fixing mouse clicks