String Fixes and Orca Tools Update