added ports, ps and various enhancements