Added more stuff, I forget.
Formating stuff done too