Fixed some formatting issues and added Larona's Changes