some fixes a little bit here and there...

Signed-off-by: Swizzy <Swizzy@xeupd.com>