New article + some fixes