Bugfixes + Strings