Fix RIL (thanks joestone) & Cleanup