Some updates

first pull request to cm-12 branches from me :)