Watsyn updates

Fix some bugs