Making sure all attributes were as correct as I can get right now
Updated even more stuff