Remade syntax, production shell, renamed and improvements