Clean up
Fixed a bug on the x-ray
Added an enum for machines