A few bugs fixed.