fix some formating and minor mistakes