Did some little changes.

Added some changes, so it can fit more in our workflow.