[#159] fixed some minor issues