PCError modification and othe improvements