A couple of fixes.

More commits to come.
* Fixes #250 
* Fixes #238 
* Adds +DONOR seperator for R_DONOR
* Fixes #245 (Credits to Akai)