change commit message and minor fixes