[+]: small fixes ...