Fixed some comments. Added machine version logic