Fixed some few bugs.