New strings added + Calculator fix (Thanks to MHarker)