updated ps1 and other changes