bugs fixed for the x's