Added ps support and some comments