[#371][finished] minor changes