unstuck and fixes