some fixes/improvement found when browsering the files