misplacement of exec_count switch on my part

Change-Id: I9f8c1493c310c799bbef9f12796bd5019247f87c
Signed-off-by: Zarboz <zarboz@gmail.com>
finishing s2w touches

Change-Id: I5a93fff2dd69a00de686ff0015bb73ece366ac84
Signed-off-by: Zarboz <zarboz@gmail.com>