master More description
master Various fixes