Loads of improvements and fixes with the machine