small changes
merge with own recent work on robot