more bugs added