Fixes concerning PWs and spelling