Rlon Patch

A few hacks and fixes.

Should be finished by tonight. Then can be pulled whenever if accepted.