Fixed some issues from old Article