*Fixed few bugs.