Fixed some line code; Fixed double click on dot bug; changed transitions again, we need to decide which ones we are going to use