fix silly bugs