Various improvements

Signed-off-by: V10lator <v10lator@myway.de>