fixed a few bugs, regenerated formatpings, make them right.