Changes to CW layers, correction to NP function, underlying changes to ohidev (these do not change the scores)