More bug fixing, issue list, algorithm tweaking