fixing small bugs.