Several bug fixes + article page draft