Merging of rptiwari and planpanel, coached mode controllers, other fixes