And some bugs fixed.