changed some formatations etc