Orca 4.1 Initial Commit, Slim recents fixes