minor comments and refractoring
First preparations for e., still fails somehow ...