some fixes plus doc update