robustness, comments, bug fix
merge and bug fix in ls