spelling and fixme's