tested all I can locally. Rest needs to be validated on pe.org -- Fix for #13