general p3 fixes; all features now roughed in but needs some stress testing