Minor bug fixes and addition of strings