Correct mistakes, add class, add header