more changes

3amotor_com not finished