fix bug with 15.17444
cosmetics
issue2 and issue3 ready for closing