some small changes, most are cosmetical