Updates based on sugesgions from Tobias