improve small stuff

Signed-off-by: Clemens Burger <clemo@hockwien.at>