Some finer bugs fixed.