Updated CHANGELOG + small fixes