fixing silly bugs