Some improvements

Signed-off-by: Uli Schlachter <psychon@znc.in>