More movement improvements