fixes to KKupa and start of motor impl