Extracted out strings from code

- Other various bug fixes and such