debuggable toString and minor changes