better names / better debug messages