fix delima of fips vs non fips on memory.h and update settings.h