fixed move events to more logical places