Bugfix: Cache issues
Text bugfixes