Fixe formatting and added some new commands