Add separate machine plus some misc fixes