improving names and minor bug fix