performance work, small movement bugs