More incremental improvements en route to ironing out these last few major bugs before release...