debug...

small improvements