solving small bugs