Minor Change and improvements WS2 and TODO