[FIX]: small improvements