Updated arm and fixed a few thing