Fixes for last commit and more red text removal. Should be all of it...