Add new strings + two fixes