more reformatting and ignoring of old non-fixed stuff..
more reformatting