More Updates

Make changes to support RIL, also a little clean up.