Sebastian + Mihai's changes, spell check