fixing some over-looked code changes much needed, but then reverted