arm move and some small fixes