fixing $/jQuery conflict bug
bunch of changes, big shit