Fix compile errors. Added previously removed xy simulations back into makefile.