fixed lots of bugs, machine in-game name bug still remains