basename fix, more