increasing usage of p<>, minor bugs fixed [code still broken]