fix #595 and fix #550

That's being done but not in the format you suggest, do you think your suggested format is better?