WS240

final fixes