Some little bugs fixed.