fix and minor changes