Fixed formatting and added new stuff