One more update for osst in 2.5.53

Below is a patch for osst, against 2.5.53, which fixes a couple of bugs,
among which a pretty likely oops, and includes some cleanup. 
At this point I'm pretty satisfied that it works properly.