Fix warnings
Fixbugs for new article