Dev

Start a new branch for developing.
Modified some key modules.