solving small bugs.