scratchy bugs fixed