Bug Fixes and PC Customized script added

Bug Fixes and PC Customized script added