Update; some bugs fixed.