minor cleanup & debug output

Signed-off-by: Martin Ankerl <martin.ankerl@gmail.com>