changed some formatting things, are these the right files????
merged testing and master