Some bugs fixed. Several logging entries added. Next: try on lunas