minor improvements on output and such