Update 1: Maple/PinPlay integration.

Various changed based on Jie's feedback.