[Andr] to preMaster

fixed some of [vtegza] comments.