Orca Tools Update and Fixes