Bug fixes and string changes