Fixed #237 and updated some strings