changed some naming things we missed and also added the manually optimized arm code, note this still needs to be tested