Adds CDMA and fixes cdma-bugs