even more improvements

Signed-off-by: Steven "NemesisRE" Koeberich <nemesissre@gmail.com>