small bugs fixed.