Update src to ver 0.9.3 level + few minor changes