update from joergkappes including TRWS-changes