Commented WS2 and updated TODO's