bugs hopefully removed