updates and bug fixes Ver2.0