Fixed spacings, line endings, and about to add some new goodies ;p