more fixes
just some new changes

Signed-off-by: saksmlz <saksmlz@gmail.com>