fixed nextclick + some rearrangements