Better Zukers

Fixed missing cases, more specific loop types