Updated TODO
Added 's' test
motion.c tidy-up