various work on movement code and other things