made PS clients simpler and few minor changes