cosmetifc fixes and prepare for --software
wron interpretation of current behaviour