some encryption cleanup (and a LOT of project build config fixes)