STILL BUGGY. Will finish find- and remove tomorrow