fix and minor update