Updated doc and small fixes