Tweaking

* re.split instead of ''.split to Jimmy-proof the splitting
* More precise commenting around line 105