Harder, better, faster, stronger

- Now with added comma!
- JMP_TOTOP kept failing and has been replaced with a direct call by Id
for now