Renamed some

P010 and P012 need some serious work. Computation run time is in hours
to days QQ.