Some progress.
Bug fixed.