Updated X-carriage and many more things