minor updates, incorporating some work from the splitmotor branch
good work