Minor changes on the way to new functionality.
Minor changes on the way to new functionality.

ivoflipse/devide,fvpolpeta/devide,ivoflipse/devide,zhangfangyan/devide,nagyistoce/devide,chrisidefix/devide,chrisidefix/devide,nagyistoce/devide,fvpolpeta/devide,zhangfangyan/devide