bug fix and file rename
some fix